Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Mon, 14 Feb 2011 12:46:45 +0000 (13:46 +0100)
committerBernd Zeimetz <bernd@bzed.de>
Mon, 14 Feb 2011 12:46:45 +0000 (13:46 +0100)
commit709bd4d98815c31fdebd9be8b1ff240ccfdf166a
treeccc0e8507724bdedf22075cbe453e3db1aba377c
parente5c3f560ed632da1b20c75b0e9b613318727fe94
parent1aa889e68129ae1d0780417e181a763b929d5527
Merge branch 'upstream'